Skip to content

Add kms keyring browser #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Apr 4, 2019
Merged

Add kms keyring browser #21

merged 12 commits into from
Apr 4, 2019

Conversation

seebees
Copy link
Contributor

@seebees seebees commented Mar 22, 2019

Issue #, if available:

Description of changes:

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

mattsb42-aws
mattsb42-aws previously approved these changes Mar 29, 2019
Copy link
Member

@mattsb42-aws mattsb42-aws left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

#IANAJSD


async _onDecrypt (material: WebCryptoDecryptionMaterial, encryptedDataKeys: EncryptedDataKey[], context?: EncryptionContext) {
const _material = await super._onDecrypt(material, encryptedDataKeys, context)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Additional branching case: if we have neither an unencrypted data key nor a cryptokey, we should return the material. This just means that we failed to decrypt any of the EDKs.

@seebees seebees merged commit c5a00dc into aws:master Apr 4, 2019
@seebees seebees deleted the add-kms-keyring-browser branch April 4, 2019 23:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants